From: Karl Heuer <kwzh@gnu.org>
Date: Thu, 5 May 1994 06:31:28 +0000 (+0000)
Subject: (xmenu_show): Disallow empty menus.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~91727
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=742f715d96986d8c3e9198579d5de5f1a65cbe0a;p=emacs.git

(xmenu_show): Disallow empty menus.
---

diff --git a/src/xmenu.c b/src/xmenu.c
index 7764ce3cd83..c22d258cbd1 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1399,6 +1399,11 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error)
 
   *error = NULL;
 
+  if (menu_items_used <= MENU_ITEMS_PANE_LENGTH)
+    {
+      *error = "Empty menu";
+      return Qnil;
+    }
   this_menu_bar_item_beg = -1;
   this_menu_bar_item_end = -1;
   last_menu_bar_item_end = -1;
@@ -2010,6 +2015,12 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error)
   if (menu_items_n_panes == 0)
     return Qnil;
 
+  if (menu_items_used <= MENU_ITEMS_PANE_LENGTH)
+    {
+      *error = "Empty menu";
+      return Qnil;
+    }
+
   /* Figure out which root window F is on.  */
   XGetGeometry (x_current_display, FRAME_X_WINDOW (f), &root,
 		&dummy_int, &dummy_int, &dummy_uint, &dummy_uint,